Don't allow to set up GL waveforms if GL is not available by daschuer · Pull Request #15762 · mixxxdj/mixxx

daschuer · 2025-12-17T13:20:30Z

This fixes a crasher when no GL is available, but GL functions are used anyway. #14561

ronso0 · 2025-12-18T18:33:16Z

Thanks for looking into this!

This PR overlaps with the changes of #15421
Do you see a chance to backport that and build the fix on top?

daschuer · 2026-01-14T20:52:16Z

Yes that seems to be reasonable.

ronso0 · 2026-01-14T21:04:13Z

Is this maybe also fixing #15858 ??
At least the stacktrace shows some GL stuff

…but not available.

daschuer · 2026-01-14T22:34:13Z

This is now rebased on #15421 (one commit actually disappears :-) )

Is this maybe also fixing #15858 ??

I need to find time for a closer look.

ronso0 · 2026-01-15T17:26:04Z

This is now rebased on #15421 (one commit actually disappears :-) )

Hehe..
Though there are still some old occurences of factory -> pFactory preventing the build.

acolombier · 2026-02-17T11:03:58Z

Do we need this in 2.6?

daschuer · 2026-02-17T12:49:29Z

The 2.5 branch is not affected.

acolombier · 2026-02-17T13:02:50Z

Yes, I meant is this one considered a blocker or can it fall behind to 2.6.1?

daschuer · 2026-02-17T13:27:31Z

It fixes a crash at least.

ronso0 · 2026-02-17T13:53:42Z

@daschuer there are conflicts now. Merge 2.6 or rebase @acolombier ?

ronso0 · 2026-02-26T23:19:03Z

The fix a6e3b02 looks good, but I can hardly give formal LGTM for a PR where the meat is my cleanup/consolidation commits from #15421

@acolombier wanna take a look?

acolombier

Code is looking good, thanks both for the good cleanup! Ran a few manual tests and everything still seem to function as expected.

Let merge this in 2.6 and as this improve the GL situation with waveform,

acolombier · 2026-02-27T19:13:24Z

@daschuer pre-commit is failing, do you want to take a look?

daschuer · 2026-04-16T22:12:50Z

This is again ready for merge.

m0dB

LGTM

daschuer · 2026-05-10T17:01:51Z

@m0dB merge? Maybe someone else wants to do it.

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Prevents crashes when OpenGL is unavailable by sanitizing backend selection and centralizing waveform option/backend handling inside WaveformWidgetFactory (issue #14561).

Changes:

Add factory helpers for setting/render backend acceleration and for reading/writing waveform renderer options.
Sanitize configured backend based on GL/GLES/shader availability.
Move several preference-dialog config writes/reads into WaveformWidgetFactory (e.g., beat grid alpha, waveform options).

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
src/waveform/waveformwidgetfactory.h	Exposes new APIs for acceleration and waveform option management.
src/waveform/waveformwidgetfactory.cpp	Adds backend sanitization and centralizes config persistence for acceleration/options/beat grid alpha.
src/preferences/dialog/dlgprefwaveform.h	Refactors private helpers to rely on factory-managed backend/option state.
src/preferences/dialog/dlgprefwaveform.cpp	Uses factory APIs instead of directly manipulating config for backend/options; adjusts UI update logic accordingly.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+    WaveformWidgetBackend backend = m_config->getValue(
+            kHardwareAccelerationKey,
            preferredBackend());
-}
+    switch (backend) {
+    case WaveformWidgetBackend::None:
+        break;
+    case WaveformWidgetBackend::GL:
+        if (!m_openGlAvailable) {
+            backend = WaveformWidgetBackend::None;
+        }
+        break;
+    case WaveformWidgetBackend::GLSL:
+        if (!m_openGlAvailable || !m_openGLShaderAvailable) {
+            backend = WaveformWidgetBackend::None;
+        }
+        break;
+#ifdef MIXXX_USE_QOPENGL
+    case WaveformWidgetBackend::AllShader:
+        if (!m_openGlAvailable && !m_openGlesAvailable) {
+            backend = WaveformWidgetBackend::None;
+        }
+        break;
+#endif
+    }
+    return backend;
+};


+WaveformWidgetBackend WaveformWidgetFactory::setAcceleration(bool enabled) {
+    WaveformWidgetBackend backend = WaveformWidgetBackend::None;
+    if (enabled) {
+        backend =
+#ifdef MIXXX_USE_QOPENGL
+                WaveformWidgetBackend::AllShader
+#else
+                WaveformWidgetBackend::GL
+#endif
+                ;
+    }
+    m_config->setValue(kHardwareAccelerationKey, backend);
+    return backend;
+}


+allshader::WaveformRendererSignalBase::Options WaveformWidgetFactory::getWaveformOptions() {
+    auto options = m_config->getValue(
+            kWaveformOptionsKey,
+            allshader::WaveformRendererSignalBase::Option::None);
+    return options;
+}


    for (const auto& holder : std::as_const(m_waveformWidgetHolders)) {
        holder.m_waveformWidget->setDisplayBeatGridAlpha(m_beatGridAlpha);
    }
+    m_config->setValue(ConfigKey(kWaveformGroup, QStringLiteral("beatGridAlpha")), alpha);


daschuer · 2026-07-12T19:57:38Z

Done

ronso0 · 2026-07-16T15:48:02Z

clazy ant macOS now complain about congif enums 🤷‍♂️

ronso0 · 2026-07-19T16:46:26Z

Now all runners stumle over that unfortunatly.

…Option

daschuer · 2026-08-04T21:47:48Z

conflicts resolved.

ronso0 · 2026-08-05T08:51:16Z

LGTM but the configobject changes are a bit above my paygrade.
@mixxxdj/developers who can check the enum/overload commits?

daschuer added this to the 2.6.0 milestone Dec 17, 2025

github-actions Bot added ui preferences waveform labels Dec 17, 2025

daschuer mentioned this pull request Dec 17, 2025

Mixxx crashes in Virtual Box in "mixxx.allshader_gl::WaveformRenderMark::updatePlayPosMarkTexture" #14561

Open

ronso0 added 5 commits January 14, 2026 22:07

Waveform preferences: remove empty destructor

0a3b60a

Waveform preferences: move get/set acceleration to factory methods

63e48ff

Waveform preferences: move get/set WaveformOptions to factory methods

f8a1c3e

Waveform preferences: factory writes beatgrid alpha to config

752e7d2

Waveform preferences: simplify set/update methods

2f9d2d5

daschuer mentioned this pull request Jan 14, 2026

Waveform preferences: optimize / cleanup #15421

Closed

Fall back to WaveformWidgetBackend::None if some other is configured …

a6e3b02

…but not available.

daschuer force-pushed the gh14561 branch from 07c5a23 to d8668a8 Compare January 14, 2026 22:30

Rename pFactory

247c47a

daschuer force-pushed the gh14561 branch from d8668a8 to 247c47a Compare January 16, 2026 04:23

Merge remote-tracking branch 'upstream/2.6' into gh14561

75e8020

acolombier approved these changes Feb 27, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/2.6' into gh14561

b79eaae

daschuer mentioned this pull request Mar 25, 2026

Require compatibility profile context when not forcing OpenGL ES #16214

Closed

m0dB approved these changes Apr 23, 2026

View reviewed changes

JoergAtGithub requested a review from Copilot June 17, 2026 19:39

Copilot AI reviewed Jun 17, 2026

View reviewed changes

Copilot started reviewing on behalf of JoergAtGithub June 17, 2026 19:56 View session

daschuer added 2 commits July 12, 2026 16:37

Always handle all WaveformWidgetBackend values

8870237

Verify in setAcceleration() that GL or GLES is available

ebc6f4c

daschuer force-pushed the gh14561 branch from ed4df2c to 6c88a13 Compare July 18, 2026 14:38

daschuer added 2 commits July 18, 2026 21:31

Introduce kBeatGridAlpha for de-duplication

1778206

Reqires that the generic overload is not an enum type

5e7366a

daschuer force-pushed the gh14561 branch 5 times, most recently from a0083a9 to 4eb59e7 Compare July 19, 2026 12:04

daschuer added 2 commits July 20, 2026 00:30

Add overload setValue(const ConfigKey& key, QFlagsType& value)

0f31d85

Fix reading allshader::WaveformRendererSignalBase::Options as single …

b08f4a8

…Option

daschuer force-pushed the gh14561 branch from 4eb59e7 to b08f4a8 Compare July 19, 2026 22:31

Merge remote-tracking branch 'upstream/2.6' into gh14561

f74555d

Uh oh!

Uh oh!

Conversation

daschuer commented Dec 17, 2025

Uh oh!

ronso0 commented Dec 18, 2025

Uh oh!

daschuer commented Jan 14, 2026

Uh oh!

ronso0 commented Jan 14, 2026

Uh oh!

daschuer commented Jan 14, 2026

Uh oh!

ronso0 commented Jan 15, 2026

Uh oh!

acolombier commented Feb 17, 2026

Uh oh!

daschuer commented Feb 17, 2026

Uh oh!

acolombier commented Feb 17, 2026

Uh oh!

daschuer commented Feb 17, 2026

Uh oh!

ronso0 commented Feb 17, 2026

Uh oh!

ronso0 commented Feb 26, 2026

Uh oh!

acolombier left a comment

Choose a reason for hiding this comment

Uh oh!

acolombier commented Feb 27, 2026

Uh oh!

daschuer commented Apr 16, 2026

Uh oh!

m0dB left a comment

Choose a reason for hiding this comment

Uh oh!

daschuer commented May 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

daschuer commented Jul 12, 2026

Uh oh!

ronso0 commented Jul 16, 2026

Uh oh!

ronso0 commented Jul 19, 2026

Uh oh!

daschuer commented Aug 4, 2026

Uh oh!

ronso0 commented Aug 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants